Skip to content

west.yml: Update TFM module SHA to bring in the TFM MCUboot update #30050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Dec 10, 2020
Merged

west.yml: Update TFM module SHA to bring in the TFM MCUboot update #30050

merged 1 commit into from
Dec 10, 2020

Conversation

@oyvindronningstad
Copy link
Contributor

@oyvindronningstad oyvindronningstad commented Nov 16, 2020 •
edited
Loading

To bring in TFM MCUboot update.

Signed-off-by: Øyvind Rønningstad [email protected]

TFM PR: zephyrproject-rtos/trusted-firmware-m#19

tejlmand
tejlmand requested changes Nov 19, 2020
View reviewed changes
Copy link
Contributor

@tejlmand tejlmand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much better, just need to adjust the repo path to Zephyrs fork.

@oyvindronningstad oyvindronningstad added the DNM This PR should not be merged (Do Not Merge) label Nov 23, 2020
@oyvindronningstad oyvindronningstad removed the DNM This PR should not be merged (Do Not Merge) label Nov 24, 2020
@tejlmand
Copy link
Contributor

tejlmand commented Nov 25, 2020

DNM as long as revision is pull/19/head

@tejlmand tejlmand added the DNM This PR should not be merged (Do Not Merge) label Nov 25, 2020
@oyvindronningstad oyvindronningstad mentioned this pull request Dec 4, 2020
Merged
@galak
Copy link
Contributor

galak commented Dec 7, 2020

Can this live in the tfm module repo instead?

@ioannisg
Copy link
Member

ioannisg commented Dec 7, 2020

Also, have we thought of using a single module repo for mcuboot, but a different branch?

@mbolivar-nordic
Copy link
Contributor

mbolivar-nordic commented Dec 8, 2020

Also, have we thought of using a single module repo for mcuboot, but a different branch?

I think that makes a lot of sense

@github-actions
Copy link

github-actions bot commented Dec 9, 2020 •
edited
Loading

The following projects have a revision update in this Pull Request:

Name Old Revision New Revision
trusted-firmware-m zephyrproject-rtos/trusted-firmware-m@4544ab9 zephyrproject-rtos/trusted-firmware-m@867d714 (master)

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@oyvindronningstad oyvindronningstad changed the title west.yml: Update TFM module SHA west.yml: Update TFM module SHA to bring in the TFM MCUboot update Dec 9, 2020
@oyvindronningstad
Copy link
Contributor Author

oyvindronningstad commented Dec 9, 2020 •
edited
Loading

Also, have we thought of using a single module repo for mcuboot, but a different branch?

I think that makes a lot of sense

Can we just create a branch later if we need it? Or would it be good to get it out of the way in case we are in a hurry when we need it? Anyway, I think that's independent of this PR.

@ioannisg
Copy link
Member

ioannisg commented Dec 9, 2020

Also, have we thought of using a single module repo for mcuboot, but a different branch?

I think that makes a lot of sense

Can we just create a branch later if we need it? Or would it be good to get it out of the way in case we are in a hurry when we need it? Anyway, I think that's independent of this PR.

We might need a policy update for this actually. I'll raise this with the Process WG

@oyvindronningstad
west.yml: Update TFM module SHA to bring in TFM MCUboot update.
6f24eb9 
Turn on import, so tfm's west.yml is processed.

Signed-off-by: Øyvind Rønningstad <[email protected]>
@oyvindronningstad
Copy link
Contributor Author

oyvindronningstad commented Dec 10, 2020

@galak Here

@oyvindronningstad oyvindronningstad removed the DNM This PR should not be merged (Do Not Merge) label Dec 10, 2020
@galak galak merged commit 8f18b86 into zephyrproject-rtos:master Dec 10, 2020
@oyvindronningstad oyvindronningstad deleted the tfm-mcuboot branch December 10, 2020 15:51
@oyvindronningstad oyvindronningstad mentioned this pull request Dec 10, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tejlmand tejlmand tejlmand approved these changes

@galak galak galak approved these changes

@microbuilder microbuilder Awaiting requested review from microbuilder

@carlescufi carlescufi Awaiting requested review from carlescufi

@mbolivar-nordic mbolivar-nordic Awaiting requested review from mbolivar-nordic

+1 more reviewer

@ioannisg ioannisg ioannisg approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area: Modules manifest manifest-trusted-firmware-m

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@oyvindronningstad @tejlmand @galak @ioannisg @mbolivar-nordic